Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Tue, 30 Jul 2013 00:29:09 +0000 (08:29 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Tue, 30 Jul 2013 00:29:09 +0000 (08:29 +0800)
commit565b39fa4b3ab4063609277cdba70af117d90f74
tree68d2c539f4ea3b786ff007c4b3781f0c30c42162
parent054144f9c56e7c4890764ee49138196016f7c556
parenta17372b4755cfcaf540f5c5bd5658deb8d92e5cd
Merge from mainline.
etc/NEWS
lisp/ChangeLog
lisp/vc/vc-dir.el